Skip to content

[pull] master from php:master#812

Merged
pull[bot] merged 2 commits intoturkdevops:masterfrom
php:master
Mar 25, 2026
Merged

[pull] master from php:master#812
pull[bot] merged 2 commits intoturkdevops:masterfrom
php:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Mar 25, 2026

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

Girgias and others added 2 commits March 25, 2026 13:30
* ext/fileinfo/libmagic/file.h: delete HAVE_STRCASESTR ifdef

PHP's copy of libmagic doesn't use the strcasestr() function,
so there is no reason to prototype it, regardless of whether
or not the OS (libc) provides it.

* ext/fileinfo/libmagic.patch: update

Run ext/fileinfo/generate_patch.sh to re-roll this patch, a recent
commit removes HAVE_STRCASESTR from PHP's copy of libmagic.

* ext/fileinfo/config.{m4,w32}: don't compile strcasestr.c

Unlike the upstream library, PHP's copy of libmagic doesn't use the
strcasestr() function, so there is no reason to include strcasestr.c
in the list of source files.
@pull pull bot locked and limited conversation to collaborators Mar 25, 2026
@pull pull bot added the ⤵️ pull label Mar 25, 2026
@pull pull bot merged commit 4139422 into turkdevops:master Mar 25, 2026
1 of 2 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants